fixed corruption & other various updates