stats + some fixes