Commented code is bad, mkay
Improved error reporting and readme