Small Changes + Fixes, larger update soon