Version/1.5 Fixes Fixes Fixes!