Fix issues 1 & issues 3
Fix issue 4