Fixes and Changes thanks to pitor