fixed the easy stuff and buttons. + cleanup