Added some more security Station parts.
Fix Build and clean up.