Fixed a bug and noted another, sigh