fixed some shtuff