Extra intent handling & bug fixes