made it look nicer and bugfix