More readable code, fixed version number, added TODO, minor improves