spacing
add some todos
update plugin versions