fix block swap parsing, loading, etc..