Finally done
minor fixes