fixed issues with includes, compiles now, rookie mistakes