fixed location errors, added more receipt work