Better code and Bug fixes