fixes and stufu