updated. bug fixes