[fix] many minor fixes
major cleanup