more bugfixes
fixed bug on 2s