few little fixes/changes