many fixes, will be done tommorow