Small bug fixes + crossbow oomph