fixed compilation errors, warnings still present