general things done

WORKING