attempted to removed some bugs - some whitespace issues may have been introduced