Various bug fixes, although still don't know any good solution for the zooming issue