Semi Final Version

More bugs fixed