add ugly fixes, calls API now