bug fixes that were uncommitted upon abandonment, lol