Fixes, Refactoring, added KS & Paint pricing