second commit - bug fixes