Maintenance

Cleaned up a bunch of stuff, updated to express 4