Updated

Small updates, still missing large chunks of functionality.