fixed major delete bug(s); currently valgrinding