Setup script and some little fixes I don't remember