updated todos
reordered symbols
renaming