Fixed more bugs

Load/Store working correctly now