Several fixes, compute stuff fleshed out a bit
Merge branch 'master' of github.com:LancasterLogRes/Noted