fix previous commit, forgot to include new files + remove extraneous thingie from header