Big update

Added things, miscellaneous tweaks and fixes.