Fixed makefiles, commented out rc generation for now