Fixing stuffwq
i
Some fixes to main