just fixing some issues