All Bugs fixed. Improved shortened code!