Bugs, functionality
Some fixes