Mobile comparison

Fixes a few more small bugs