Fixed zero-bug (initialization list was not the same order as declarations) + some other improvements