added aceler's fixes