cleaning stuff up, fixing errors