cleaned up code, update modules