reworked unless statements, removed var resolve, and misc stuff