fixes for issues 1+2

not sure that i know how to use git correctly, but these should be fixes for issues 1 and 2