Add a couple of bugs that'll need fixing
Modify README
Whoops, should put copyright notices on those
Fix a couple of known deficiencies