Little things added, nothing tested