just basic updates and clearing stuff up!