Cool improvings (now search a bit)