various updates, all that is left is padding i think