Some fixes and changes less spam