small changes, preparing to rewrite ui