Bug fixing and ready for debuging! :D