some small fixes and tries