some fixes/test