improvements to docking and other misc fixes
Merge pull request #63 from ParagonDevelopmentTeam/docking_improvement

improvements to docking and other misc fixes