cleaned up a bit
fixes?
#include fixes