Commit 34

Lots of editing, some new features but mostly bug fixes. Maths is
altered a bit, new system list is fully functioning.