fixed a lot, works again