Bug fix
Fixed some errors. App should be a little snappier now as well