fixes #4 and various errors