Updated API, small fixes