Some more polish, things should start to settle down now