- fixing some issues