merge in codio's changes

more to come