Feature/some fixes

Branch for fixes to small fixes to adaptor while working on AMUSE.

(Please keep branch for now)