update of yestersdays work
fixed alot of things, but made another problem .. COLONS