Accessories Complete & Other Fixes