Preliminary testing, some bugfixes and notes