final integration done. bugs removed.