Small updates and a lot of ugly comments