updated header / fixed some errors