cleaned up compilation errors