Updated README, small code improvemnts