fixed some typos, slight refactors
fixes for poor header inclusion casued by precompiled headers