Fixed a bug, added functionality
administrative changes