extended programming

fixed a lot of things