Random Fixes but mainly still broken.