styling

still a WIP
misc
last bits
one last commit
finally?