Misc tweaks

Fixed dangling lines from before feat changes
Adjusted initiative handling to better match other similar functions