Add Codebase and Sirportly and some housekeeping