fixes and SHIT