Small changes, mainly for api

- more aliases