forgot to check if it compiled; fixed some mistakes