final bug fixes :smile_cat: