Bug fixes, changing the methots etc

still much to do