Introducing some minor changes, mainly after getting to know idris.