Clean repo + fixes
update comment