Final additions and changes