fixing some shtuff