Fix small stuff + add some more feautres