Better UX, fixed stupid bug, tweaked some numbers