added pretty stuff and fixed bugs