cleanUp + some small updates