Fixed a lot of freezing and sectional issues