Updates, stability patches

Need to user cache to really fix the issues though