Maintenance update

Fixed a few slightly bugged features.