fix
fix editing/viewing issue
almost ready