Some comments cleaned up and readme updated