fixes on first version