Improve several things and some README usage