finally end, bug fixes