added in fixmes and fixed an error