DataBaseHandler Fix and Program Cleanup