logical organization
fixed a few houdini bugs