More additions and things