API bugfix & minor update