solving bugs
enhancements