Fixed Strings and some cleanup