removed missing link
internalized data slots, some code cleaning