fixed more issues...
fixed most include issues