Update

Clean up code & update a few areas.