fixed @rombadls bugs