Updated some stuff

Check the Need to Do to see what I all did... none of its tested