Add system information, various bugfixes