multiple bugs issues

Frans Rosén @detectify
earned 750 at Oct. 15, 2014