giant commit including listings and abilities, plus removes unnecessary stuff