fixed bugs
finished functionality, needs styling