Fixed default + rewrote stuff