bug fix & add components