cleaned up the code a bit
cleaned up the code a bit
fixed some more code.