Bug fixes, hyper beam now working correctly