fixed things and jokes :)