bug fixes and preparation for something interesting )