added cleanup method for subclassing
updated demo, working on deletion
fixed demo