Functionality bugs solved....