-added few fixes