fixes and commit test