Added a simple canvas drawing utility, other small fixes