swing based hitting + bug fixes...