more fixes, things are working fine