overall fixes
minor fixes