Minor changes and major improvements