minor fixes. need to get rid of the armor-bar.