Cross platform integration and minor bugs fixed