few more changes

still cleaning it