mini DIGMA 30

Ugh, had some really annoying bugs that are fixed now