Major changes and all that
Real fixes