Blaster Rifle works, minor Bug
Some Code Cleanup