final bug fixes :godmode: