changed component name and fixed a few small things