lots of changes
more hws. almost done iwth semester