fixed some minor changes once again