a few updates to the code. Taking out lots of old un-used code