Some changes - tweaks & files from working device