fix

fckign stupid, but
fixes #10,
fixes #5,
fixes #4