cleanup, change pointers to refs when possible
add icon