wip model
bug fixes