cleaned up functions a bit
cleaned up functions a bit
fixed some more problems