Many corrections + some cleanup