Added more platforms, small changes