still cleaning a few things up