fixed pricing issues and cleaned up some code