Huge bugfix of key issues