modified defaults to eliminate need for hideon hacks
removed unused variable 't'
Merge pull request #2 from vercasson/master

modified defaults to eliminate need for hideon hacks