Fixed numerous small bugs and improved extra plot behaviour