Also, not tested.  Will fix both those problems.