Fixed logging in, added some small features