Algroithm tweaks, and frontend peeks