updated register names
unbroke the wave
floating overlay
fixed naming issues
mid-work
merged into master