Fixed drawing and init