crash fix correction & clean up