made floating and small fixes