lots o changes

forgot to commit for quite a long time