last minute bug fixes & stuff