Implemented session expiration
Minor fixes and improvements