Fixed some toggle behaviour. Fixed issue 4.