Total fixes.

Working but flicking