API cleaned, some more behaviour added

State as Alpha release