fixes #2

also other tweeks