Mainly just bug fixes