some fixes oO