Add synchronized methods, some little fixes