fixes
some work and features