Change some stuff, added solid wireframes