Higher resolution and some bug fixes