Fixed a few typos
Bugfix. Indentation in decorator function
Basic working implementation.  Minor bugfixes and improvements