Made some little fixes and improvements