Tests and stuffs

and some minor front end changes