some basic amends and updates - needs to be cleaned up