Reverse some minor changes, update database, create some controller