Sprucing up the place

Made stuff neater, added a few args, fixed a few things.