cleanup up/reduced some references
added delete ability, hacky observe trickery