cleanup and comments
add missing marker interface