second commit: bug fixes