Bug fixes

Issues solved: #50 (closed), #31 (closed), #41 (closed), #46 (closed), #38 (closed), #43 (closed), #48 (closed)