Add subjects and some tweaks