Updated code templates.
Some cleanup and fixed Issue #84
Cleanup...
Cleanup and quick fixes.
Cleanup and trying to fix bugs...