Added c-a functionality and fixed history