friggin bug fixes