bug fixing
improving stability