added convert_origin, and fixed specs