Changeing Class name, closing cursors and small changs