Performance & bug fixes