Load and load of changes

Packed to the BRIM with bug fixes and improvements!