Minor changes

Minor bugs fixed