Bugfixes and added DefaultID's