Error fix, prioritize tweaks