Fix minor bugs
Create generators
Fix formatting