support really added now (commit before was empty??)
+ more hardening