Attempts to fix bugs
Updated dev version