Codyedit for #440

Fixed issues 7, 8, 10, 12, and 13 for #440