float & fix bugs