added few fixes