Checked memory frees and added minor code fixes