making more fixes, super hacky!