fixed some stuff broken in last commit