Lots of updates, stability improvements, dealing with corner cases