Moved to express and several other minor updates