finished fixing basic behavior (last of friday)