FIXing - random Typos && more...r