fixed version show/hide

Added some TODOs also