Better js, added taglines, some error-checking