typos and last update for docking class
formating code
merging changes