Bugfixes; interface change (its closer to SamIam now)