First bugfix, almost working now