Bugs, cleanup

Bugs and info, restruct