Additions and cleanup