Quick fixes; More documentation