A bunch of stuff added....should've uploaded more often