Updated Changes

Some more fixes and shorter code