#6 - Small fixes and speeupds