Updated with some minor tweakish things.
Bugfix?