Master

Some additions and improvements.