~Little fixes for mega-feature