Merge pull request #105 from Useful-Innovation/johans-fixes

fixed validation on new time/purchase
Merge pull request #106 from Useful-Innovation/johans-fixes

validation fix