Minor changes. NEEDS refactoring, get it working first then get it working nicely is the mantra