moderate amt of new functionality, some gui changes