modifications, cleaning up - WIP