Cleanup, stability improvements