fixed mistakes. all running again