repo cleanup and add missing stuff