Improvements of methods + errorhandling