commited all bug fixes