Non-sticky, minor improvements, cleanup