Updated with more fixes