Update

Update including new wiki entries