Started on style + a few minor bugfixes