register bug fixed
touch-up stuff
fixed bug; cleanup