bug fixing
usability again