bugfix
fix types and status