Much fixes...wow!