Updated and fixed register errors.
Merge branch 'frontend' of https://github.com/BarnBay/master.git into frontend