Final changes and stuff