bug fixes

Signed-off-by: Dave Nelson <chwebdev1@gmail.com>
Merge branch 'master' of https://github.com/chlawfirm/UPILF-Re