Updated for SevenCommons & some general cleanup