Fixed issue 1
Fixed issue 2
Fixed issue 3
Fixed issue 3 for realz this time