Fix point opacity drawing
Update
Move under DEBUG
Refactor drawing code around