reworked a few things