fixed stupid bugs of armguy + style fixes