various changes - removed some stuff as well!