add apierror and more sets/gets
Merge remote-tracking branch 'origin/master'