fixing tabbing since it was messy
adding missing assembly