misc fixes
More efficient sluggification