Fixed a couple of bugs and added JWT managing