Addressed a bunch of issues from the queue.
Closes #11 (closed), #20 (closed), #30 (closed), #38 (closed)