many many small fixes, closer