fixed more bugs - still buggy