updated some stuff so I can use less