issue 1 and 2 (hopefully) fixed