many fixes, ideas