updated a bit more, all running now