fixed a few bugs and tested in van
forgot ringing sound
merged with sols code