fps and some fixes