speed / efficiency fixes