fix huge amount of bugs!