adding hah and fixing a few things