somes fixes and logs