minor fixes, good build