Fixed #38, #40, #48, #49 and #50

pretty straight forward i think, fixed these issues