Minor updates
final updates!