bugs fixed && addressing ....