some small fixes, working now