Many more fixes, supplications looking to finish soon