add origins, fix tiny bug