fixed several areas