minor fixes, use this not one before