Few more Changes

Just a few more Changes. Still untested.