added more entries
fixed some datatypes