Fixes, cool stuff