minor fixes, latest build