Add developer mode, other small fixes