comments and tweaks
comments and tweaks
fix