fixed some to make it work, hadve a look