Stuff

done a bit.