Minor cleanups
Made collect_helpers non-public
Finished skill attacks, no tests yet.